Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 27 Apr 2010 06:45:13 +0000 (06:45 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 27 Apr 2010 06:45:13 +0000 (06:45 +0000)
commit9ddc0b1e6889d52f3873f64ac38504bfe66be255
tree2c8a913842422effa8dd0ed8f7bf0cf882f15b98
parent3e75f6801fa4e3fe0da2a537431b003e026253a8
parentd0ec2496f21da84ac50c9414fb3e58563e8d9bfc
Merge from mainline.